Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix a couple i18n cases #17805

Merged
merged 1 commit into from
Oct 12, 2020
Merged

Fix a couple i18n cases #17805

merged 1 commit into from
Oct 12, 2020

Conversation

ijjk
Copy link
Member

@ijjk ijjk commented Oct 12, 2020

While working on #17755 noticed a couple of cases that needed fixing and broke them out to this PR to make that one easier to review. One fix is for ssgCacheKey where it wasn't having the locale prefix stripped correctly due to the locales no longer being populated under the server instances renderOpts and the second fix is for the asPath not being set to / when the locale is the only part in the URL e.g. /en became an empty string ""

x-ref: #17370

@ijjk
Copy link
Member Author

ijjk commented Oct 12, 2020

Stats from current PR

Default Server Mode (Decrease detected ✓)
General Overall decrease ✓
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
buildDuration 11.5s 11.1s -456ms
nodeModulesSize 63.4 MB 63.4 MB -31 B
Page Load Tests Overall decrease ⚠️
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
/ failed reqs 0 0 ✓
/ total time (seconds) 2.082 2.186 ⚠️ +0.1
/ avg req/sec 1200.49 1143.48 ⚠️ -57.01
/error-in-render failed reqs 0 0 ✓
/error-in-render total time (seconds) 1.145 1.193 ⚠️ +0.05
/error-in-render avg req/sec 2182.47 2095.93 ⚠️ -86.54
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
677f882d2ed8..133b.js gzip 11.1 kB 11.1 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-faae5f7..727a.js gzip 7.22 kB 7.22 kB ✓
webpack-e067..f178.js gzip 751 B 751 B ✓
Overall change 58 kB 58 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
677f882d2ed8..dule.js gzip 6.9 kB 6.9 kB ✓
framework.HA..dule.js gzip 39 kB 39 kB ✓
main-d2ce890..dule.js gzip 6.28 kB 6.28 kB ✓
webpack-07c5..dule.js gzip 751 B 751 B ✓
Overall change 52.9 kB 52.9 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
polyfills-4b..e242.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB ✓
_error-ed1b0..8fbd.js gzip 3.44 kB 3.44 kB ✓
hooks-89731c..c609.js gzip 887 B 887 B ✓
index-17468f..5d83.js gzip 227 B 227 B ✓
link-409b283..e3ab.js gzip 1.32 kB 1.32 kB ✓
routerDirect..924c.js gzip 284 B 284 B ✓
withRouter-7..c13d.js gzip 284 B 284 B ✓
Overall change 7.73 kB 7.73 kB ✓
Client Pages Modern
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
_app-75d3a82..dule.js gzip 625 B 625 B ✓
_error-4469a..dule.js gzip 2.29 kB 2.29 kB ✓
hooks-cbf13f..dule.js gzip 387 B 387 B ✓
index-b9a643..dule.js gzip 226 B 226 B ✓
link-92d3016..dule.js gzip 1.28 kB 1.28 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-f..dule.js gzip 282 B 282 B ✓
Overall change 5.37 kB 5.37 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
_buildManifest.js gzip 323 B 323 B ✓
_buildManife..dule.js gzip 329 B 329 B ✓
Overall change 652 B 652 B ✓
Rendered Page Sizes Overall increase ⚠️
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
index.html gzip 1 kB 1 kB ✓
link.html gzip 1.01 kB 1.01 kB ⚠️ +1 B
withRouter.html gzip 995 B 996 B ⚠️ +1 B
Overall change 3.01 kB 3.01 kB ⚠️ +2 B

Diffs

Diff for index.html 
@@ -6,7 +6,7 @@
     <noscript data-n-css="true"></noscript>
     <link
       rel="preload"
-      href="/_next/static/chunks/main-0e5b0f2c54131a0cba5f.module.js"
+      href="/_next/static/chunks/main-3f59521eeb32ac7b02b1.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -85,13 +85,13 @@
       src="/_next/static/chunks/polyfills-f73ba3fc145972ef83e9.js"
     ></script>
     <script
-      src="/_next/static/chunks/main-ceaeaf1cb88be54dd6a8.js"
+      src="/_next/static/chunks/main-3288e8470b4dc636e132.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/main-0e5b0f2c54131a0cba5f.module.js"
+      src="/_next/static/chunks/main-3f59521eeb32ac7b02b1.module.js"
       async=""
       crossorigin="anonymous"
       type="module"
Diff for link.html 
@@ -6,7 +6,7 @@
     <noscript data-n-css="true"></noscript>
     <link
       rel="preload"
-      href="/_next/static/chunks/main-0e5b0f2c54131a0cba5f.module.js"
+      href="/_next/static/chunks/main-3f59521eeb32ac7b02b1.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -90,13 +90,13 @@
       src="/_next/static/chunks/polyfills-f73ba3fc145972ef83e9.js"
     ></script>
     <script
-      src="/_next/static/chunks/main-ceaeaf1cb88be54dd6a8.js"
+      src="/_next/static/chunks/main-3288e8470b4dc636e132.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/main-0e5b0f2c54131a0cba5f.module.js"
+      src="/_next/static/chunks/main-3f59521eeb32ac7b02b1.module.js"
       async=""
       crossorigin="anonymous"
       type="module"
Diff for withRouter.html 
@@ -6,7 +6,7 @@
     <noscript data-n-css="true"></noscript>
     <link
       rel="preload"
-      href="/_next/static/chunks/main-0e5b0f2c54131a0cba5f.module.js"
+      href="/_next/static/chunks/main-3f59521eeb32ac7b02b1.module.js"
       as="script"
       crossorigin="anonymous"
     />
@@ -85,13 +85,13 @@
       src="/_next/static/chunks/polyfills-f73ba3fc145972ef83e9.js"
     ></script>
     <script
-      src="/_next/static/chunks/main-ceaeaf1cb88be54dd6a8.js"
+      src="/_next/static/chunks/main-3288e8470b4dc636e132.js"
       async=""
       crossorigin="anonymous"
       nomodule=""
     ></script>
     <script
-      src="/_next/static/chunks/main-0e5b0f2c54131a0cba5f.module.js"
+      src="/_next/static/chunks/main-3f59521eeb32ac7b02b1.module.js"
       async=""
       crossorigin="anonymous"
       type="module"
Serverless Mode (Decrease detected ✓)
General Overall decrease ✓
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
buildDuration 13.1s 12.4s -683ms
nodeModulesSize 63.4 MB 63.4 MB -31 B
Client Bundles (main, webpack, commons)
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
677f882d2ed8..133b.js gzip 11.1 kB 11.1 kB ✓
framework.HASH.js gzip 39 kB 39 kB ✓
main-faae5f7..727a.js gzip 7.22 kB N/A N/A
webpack-e067..f178.js gzip 751 B 751 B ✓
main-2540b2f..aa10.js gzip N/A 7.22 kB N/A
Overall change 58 kB 58 kB ✓
Client Bundles (main, webpack, commons) Modern
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
677f882d2ed8..dule.js gzip 6.9 kB 6.9 kB ✓
framework.HA..dule.js gzip 39 kB 39 kB ✓
main-d2ce890..dule.js gzip 6.28 kB N/A N/A
webpack-07c5..dule.js gzip 751 B 751 B ✓
main-0d1e0b8..dule.js gzip N/A 6.28 kB N/A
Overall change 52.9 kB 52.9 kB ✓
Legacy Client Bundles (polyfills)
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
polyfills-4b..e242.js gzip 31 kB 31 kB ✓
Overall change 31 kB 31 kB ✓
Client Pages
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
_app-9a0b9e1..b37e.js gzip 1.28 kB 1.28 kB ✓
_error-ed1b0..8fbd.js gzip 3.44 kB 3.44 kB ✓
hooks-89731c..c609.js gzip 887 B 887 B ✓
index-17468f..5d83.js gzip 227 B 227 B ✓
link-409b283..e3ab.js gzip 1.32 kB 1.32 kB ✓
routerDirect..924c.js gzip 284 B 284 B ✓
withRouter-7..c13d.js gzip 284 B 284 B ✓
Overall change 7.73 kB 7.73 kB ✓
Client Pages Modern
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
_app-75d3a82..dule.js gzip 625 B 625 B ✓
_error-4469a..dule.js gzip 2.29 kB 2.29 kB ✓
hooks-cbf13f..dule.js gzip 387 B 387 B ✓
index-b9a643..dule.js gzip 226 B 226 B ✓
link-92d3016..dule.js gzip 1.28 kB 1.28 kB ✓
routerDirect..dule.js gzip 284 B 284 B ✓
withRouter-f..dule.js gzip 282 B 282 B ✓
Overall change 5.37 kB 5.37 kB ✓
Client Build Manifests
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
_buildManifest.js gzip 323 B 323 B ✓
_buildManife..dule.js gzip 329 B 329 B ✓
Overall change 652 B 652 B ✓
Serverless bundles
vercel/next.js canary ijjk/next.js i18n/follow-up-fixes Change
_error.js 1.05 MB 1.05 MB ✓
404.html 4.34 kB 4.34 kB ✓
hooks.html 3.92 kB 3.92 kB ✓
index.js 1.05 MB 1.05 MB ✓
link.js 1.1 MB 1.1 MB ✓
routerDirect.js 1.09 MB 1.09 MB ✓
withRouter.js 1.09 MB 1.09 MB ✓
Overall change 5.41 MB 5.41 MB ✓
Commit: 614b391

@ijjk ijjk marked this pull request as ready for review October 12, 2020 04:12
@kodiakhq kodiakhq bot merged commit 854a849 into vercel:canary Oct 12, 2020
@ijjk ijjk deleted the i18n/follow-up-fixes branch October 12, 2020 16:54
@vercel vercel locked as resolved and limited conversation to collaborators Jan 29, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@timneutkens timneutkens timneutkens approved these changes

@lfades lfades Awaiting requested review from lfades

@Timer Timer Awaiting requested review from Timer

Assignees
No one assigned
Labels
type: next
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ijjk @timneutkens